From d844abe066a77077c4a44cda5ecab6ac1656b801 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Thu, 13 Oct 2016 15:55:00 +0200 Subject: [PATCH] Remove GtkTable --- demos/gtk-demo/main.c | 1 - docs/reference/gtk/gtk4-sections.txt | 34 - gtk/deprecated/Makefile.inc | 2 - gtk/deprecated/gtktable.c | 1932 -------------------------- gtk/deprecated/gtktable.h | 180 --- gtk/gtk.h | 1 - gtk/gtkgrid.c | 4 +- testsuite/a11y/children.c | 1 - testsuite/gtk/builder.c | 1 - testsuite/gtk/notify.c | 1 - 10 files changed, 2 insertions(+), 2155 deletions(-) delete mode 100644 gtk/deprecated/gtktable.c delete mode 100644 gtk/deprecated/gtktable.h diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index 616c33f38c..ea7da0a303 100644 --- a/demos/gtk-demo/main.c +++ b/demos/gtk-demo/main.c @@ -293,7 +293,6 @@ static gchar *types[] = "PangoMatrix ", "PangoContext ", "PangoLayout ", - "GtkTable ", "GtkToggleButton ", "GString ", "GtkIconSize ", diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index 94b44ff4eb..d79d1a32a0 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -3259,40 +3259,6 @@ GtkLevelBarPrivate gtk_level_bar_get_type -
-gtktable -GtkTable -GtkTable -gtk_table_new -gtk_table_resize -gtk_table_get_size -GtkAttachOptions -gtk_table_attach -gtk_table_attach_defaults -gtk_table_set_row_spacing -gtk_table_set_col_spacing -gtk_table_set_row_spacings -gtk_table_set_col_spacings -gtk_table_set_homogeneous -gtk_table_get_default_row_spacing -gtk_table_get_homogeneous -gtk_table_get_row_spacing -gtk_table_get_col_spacing -gtk_table_get_default_col_spacing - -GTK_TABLE -GTK_IS_TABLE -GTK_TYPE_TABLE -GTK_TABLE_CLASS -GTK_IS_TABLE_CLASS -GTK_TABLE_GET_CLASS - -GtkTablePrivate -GtkTableChild -GtkTableRowCol -gtk_table_get_type -
-
gtktearoffmenuitem GtkTearoffMenuItem diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc index 4cc0f9cdc1..371be26ced 100644 --- a/gtk/deprecated/Makefile.inc +++ b/gtk/deprecated/Makefile.inc @@ -8,7 +8,6 @@ deprecated_h_sources = \ deprecated/gtkrecentaction.h \ deprecated/gtkstock.h \ deprecated/gtksymboliccolor.h \ - deprecated/gtktable.h \ deprecated/gtktoggleaction.h \ deprecated/gtkuimanager.h @@ -26,6 +25,5 @@ deprecated_c_sources = \ deprecated/gtkrecentaction.c \ deprecated/gtkstock.c \ deprecated/gtksymboliccolor.c \ - deprecated/gtktable.c \ deprecated/gtktoggleaction.c \ deprecated/gtkuimanager.c diff --git a/gtk/deprecated/gtktable.c b/gtk/deprecated/gtktable.c deleted file mode 100644 index a10e893abf..0000000000 --- a/gtk/deprecated/gtktable.c +++ /dev/null @@ -1,1932 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#include "config.h" - -#define GDK_DISABLE_DEPRECATION_WARNINGS - -#include "gtktable.h" - -#include "gtktypebuiltins.h" -#include "gtkprivate.h" -#include "gtkintl.h" - - -/** - * SECTION:gtktable - * @Short_description: Pack widgets in regular patterns - * @Title: GtkTable - * @See_also: #GtkGrid - * - * The #GtkTable functions allow the programmer to arrange widgets in rows and - * columns, making it easy to align many widgets next to each other, - * horizontally and vertically. - * - * Tables are created with a call to gtk_table_new(), the size of which can - * later be changed with gtk_table_resize(). - * - * Widgets can be added to a table using gtk_table_attach() or the more - * convenient (but slightly less flexible) gtk_table_attach_defaults(). - * - * To alter the space next to a specific row, use gtk_table_set_row_spacing(), - * and for a column, gtk_table_set_col_spacing(). - * The gaps between all rows or columns can be changed by - * calling gtk_table_set_row_spacings() or gtk_table_set_col_spacings() - * respectively. Note that spacing is added between the - * children, while padding added by gtk_table_attach() is added on - * either side of the widget it belongs to. - * - * gtk_table_set_homogeneous(), can be used to set whether all cells in the - * table will resize themselves to the size of the largest widget in the table. - * - * > #GtkTable has been deprecated. Use #GtkGrid instead. It provides the same - * > capabilities as GtkTable for arranging widgets in a rectangular grid, but - * > does support height-for-width geometry management. - */ - - -struct _GtkTablePrivate -{ - GtkTableRowCol *cols; - GtkTableRowCol *rows; - - GList *children; - - guint16 column_spacing; - guint16 ncols; - guint16 nrows; - guint16 row_spacing; - - guint homogeneous : 1; -}; - -enum -{ - PROP_0, - PROP_N_ROWS, - PROP_N_COLUMNS, - PROP_COLUMN_SPACING, - PROP_ROW_SPACING, - PROP_HOMOGENEOUS -}; - -enum -{ - CHILD_PROP_0, - CHILD_PROP_LEFT_ATTACH, - CHILD_PROP_RIGHT_ATTACH, - CHILD_PROP_TOP_ATTACH, - CHILD_PROP_BOTTOM_ATTACH, - CHILD_PROP_X_OPTIONS, - CHILD_PROP_Y_OPTIONS, - CHILD_PROP_X_PADDING, - CHILD_PROP_Y_PADDING -}; - - -static void gtk_table_finalize (GObject *object); -static void gtk_table_get_preferred_width (GtkWidget *widget, - gint *minimum, - gint *natural); -static void gtk_table_get_preferred_height (GtkWidget *widget, - gint *minimum, - gint *natural); -static void gtk_table_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); -static void gtk_table_add (GtkContainer *container, - GtkWidget *widget); -static void gtk_table_remove (GtkContainer *container, - GtkWidget *widget); -static void gtk_table_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data); -static void gtk_table_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); -static void gtk_table_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void gtk_table_set_child_property (GtkContainer *container, - GtkWidget *child, - guint property_id, - const GValue *value, - GParamSpec *pspec); -static void gtk_table_get_child_property (GtkContainer *container, - GtkWidget *child, - guint property_id, - GValue *value, - GParamSpec *pspec); -static GType gtk_table_child_type (GtkContainer *container); - - -static void gtk_table_size_request_init (GtkTable *table); -static void gtk_table_size_request_pass1 (GtkTable *table); -static void gtk_table_size_request_pass2 (GtkTable *table); -static void gtk_table_size_request_pass3 (GtkTable *table); - -static void gtk_table_size_allocate_init (GtkTable *table); -static void gtk_table_size_allocate_pass1 (GtkTable *table); -static void gtk_table_size_allocate_pass2 (GtkTable *table); - - -G_DEFINE_TYPE_WITH_PRIVATE (GtkTable, gtk_table, GTK_TYPE_CONTAINER) - -static void -gtk_table_class_init (GtkTableClass *class) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (class); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); - GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class); - - gobject_class->finalize = gtk_table_finalize; - - gobject_class->get_property = gtk_table_get_property; - gobject_class->set_property = gtk_table_set_property; - - widget_class->get_preferred_width = gtk_table_get_preferred_width; - widget_class->get_preferred_height = gtk_table_get_preferred_height; - widget_class->size_allocate = gtk_table_size_allocate; - - container_class->add = gtk_table_add; - container_class->remove = gtk_table_remove; - container_class->forall = gtk_table_forall; - container_class->child_type = gtk_table_child_type; - container_class->set_child_property = gtk_table_set_child_property; - container_class->get_child_property = gtk_table_get_child_property; - - g_object_class_install_property (gobject_class, - PROP_N_ROWS, - g_param_spec_uint ("n-rows", - P_("Rows"), - P_("The number of rows in the table"), - 1, - 65535, - 1, - GTK_PARAM_READWRITE)); - g_object_class_install_property (gobject_class, - PROP_N_COLUMNS, - g_param_spec_uint ("n-columns", - P_("Columns"), - P_("The number of columns in the table"), - 1, - 65535, - 1, - GTK_PARAM_READWRITE)); - g_object_class_install_property (gobject_class, - PROP_ROW_SPACING, - g_param_spec_uint ("row-spacing", - P_("Row spacing"), - P_("The amount of space between two consecutive rows"), - 0, - 65535, - 0, - GTK_PARAM_READWRITE)); - g_object_class_install_property (gobject_class, - PROP_COLUMN_SPACING, - g_param_spec_uint ("column-spacing", - P_("Column spacing"), - P_("The amount of space between two consecutive columns"), - 0, - 65535, - 0, - GTK_PARAM_READWRITE)); - g_object_class_install_property (gobject_class, - PROP_HOMOGENEOUS, - g_param_spec_boolean ("homogeneous", - P_("Homogeneous"), - P_("If TRUE, the table cells are all the same width/height"), - FALSE, - GTK_PARAM_READWRITE)); - - gtk_container_class_install_child_property (container_class, - CHILD_PROP_LEFT_ATTACH, - g_param_spec_uint ("left-attach", - P_("Left attachment"), - P_("The column number to attach the left side of the child to"), - 0, 65535, 0, - GTK_PARAM_READWRITE)); - gtk_container_class_install_child_property (container_class, - CHILD_PROP_RIGHT_ATTACH, - g_param_spec_uint ("right-attach", - P_("Right attachment"), - P_("The column number to attach the right side of a child widget to"), - 1, 65535, 1, - GTK_PARAM_READWRITE)); - gtk_container_class_install_child_property (container_class, - CHILD_PROP_TOP_ATTACH, - g_param_spec_uint ("top-attach", - P_("Top attachment"), - P_("The row number to attach the top of a child widget to"), - 0, 65535, 0, - GTK_PARAM_READWRITE)); - gtk_container_class_install_child_property (container_class, - CHILD_PROP_BOTTOM_ATTACH, - g_param_spec_uint ("bottom-attach", - P_("Bottom attachment"), - P_("The row number to attach the bottom of the child to"), - 1, 65535, 1, - GTK_PARAM_READWRITE)); - gtk_container_class_install_child_property (container_class, - CHILD_PROP_X_OPTIONS, - g_param_spec_flags ("x-options", - P_("Horizontal options"), - P_("Options specifying the horizontal behaviour of the child"), - GTK_TYPE_ATTACH_OPTIONS, GTK_EXPAND | GTK_FILL, - GTK_PARAM_READWRITE)); - gtk_container_class_install_child_property (container_class, - CHILD_PROP_Y_OPTIONS, - g_param_spec_flags ("y-options", - P_("Vertical options"), - P_("Options specifying the vertical behaviour of the child"), - GTK_TYPE_ATTACH_OPTIONS, GTK_EXPAND | GTK_FILL, - GTK_PARAM_READWRITE)); - gtk_container_class_install_child_property (container_class, - CHILD_PROP_X_PADDING, - g_param_spec_uint ("x-padding", - P_("Horizontal padding"), - P_("Extra space to put between the child and its left and right neighbors, in pixels"), - 0, 65535, 0, - GTK_PARAM_READWRITE)); - gtk_container_class_install_child_property (container_class, - CHILD_PROP_Y_PADDING, - g_param_spec_uint ("y-padding", - P_("Vertical padding"), - P_("Extra space to put between the child and its upper and lower neighbors, in pixels"), - 0, 65535, 0, - GTK_PARAM_READWRITE)); -} - -static GType -gtk_table_child_type (GtkContainer *container) -{ - return GTK_TYPE_WIDGET; -} - -static void -gtk_table_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - GtkTable *table = GTK_TABLE (object); - GtkTablePrivate *priv = table->priv; - - switch (prop_id) - { - case PROP_N_ROWS: - g_value_set_uint (value, priv->nrows); - break; - case PROP_N_COLUMNS: - g_value_set_uint (value, priv->ncols); - break; - case PROP_ROW_SPACING: - g_value_set_uint (value, priv->row_spacing); - break; - case PROP_COLUMN_SPACING: - g_value_set_uint (value, priv->column_spacing); - break; - case PROP_HOMOGENEOUS: - g_value_set_boolean (value, priv->homogeneous); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gtk_table_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - GtkTable *table = GTK_TABLE (object); - GtkTablePrivate *priv = table->priv; - - switch (prop_id) - { - case PROP_N_ROWS: - gtk_table_resize (table, g_value_get_uint (value), priv->ncols); - break; - case PROP_N_COLUMNS: - gtk_table_resize (table, priv->nrows, g_value_get_uint (value)); - break; - case PROP_ROW_SPACING: - gtk_table_set_row_spacings (table, g_value_get_uint (value)); - break; - case PROP_COLUMN_SPACING: - gtk_table_set_col_spacings (table, g_value_get_uint (value)); - break; - case PROP_HOMOGENEOUS: - gtk_table_set_homogeneous (table, g_value_get_boolean (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gtk_table_set_child_property (GtkContainer *container, - GtkWidget *child, - guint property_id, - const GValue *value, - GParamSpec *pspec) -{ - GtkTable *table = GTK_TABLE (container); - GtkTablePrivate *priv = table->priv; - GtkTableChild *table_child; - GList *list; - - table_child = NULL; - for (list = priv->children; list; list = list->next) - { - table_child = list->data; - - if (table_child->widget == child) - break; - } - if (!list) - { - GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec); - return; - } - - switch (property_id) - { - case CHILD_PROP_LEFT_ATTACH: - table_child->left_attach = g_value_get_uint (value); - if (table_child->right_attach <= table_child->left_attach) - table_child->right_attach = table_child->left_attach + 1; - if (table_child->right_attach >= priv->ncols) - gtk_table_resize (table, priv->nrows, table_child->right_attach); - break; - case CHILD_PROP_RIGHT_ATTACH: - table_child->right_attach = g_value_get_uint (value); - if (table_child->right_attach <= table_child->left_attach) - table_child->left_attach = table_child->right_attach - 1; - if (table_child->right_attach >= priv->ncols) - gtk_table_resize (table, priv->nrows, table_child->right_attach); - break; - case CHILD_PROP_TOP_ATTACH: - table_child->top_attach = g_value_get_uint (value); - if (table_child->bottom_attach <= table_child->top_attach) - table_child->bottom_attach = table_child->top_attach + 1; - if (table_child->bottom_attach >= priv->nrows) - gtk_table_resize (table, table_child->bottom_attach, priv->ncols); - break; - case CHILD_PROP_BOTTOM_ATTACH: - table_child->bottom_attach = g_value_get_uint (value); - if (table_child->bottom_attach <= table_child->top_attach) - table_child->top_attach = table_child->bottom_attach - 1; - if (table_child->bottom_attach >= priv->nrows) - gtk_table_resize (table, table_child->bottom_attach, priv->ncols); - break; - case CHILD_PROP_X_OPTIONS: - { - table_child->xexpand = (g_value_get_flags (value) & GTK_EXPAND) != 0; - table_child->xshrink = (g_value_get_flags (value) & GTK_SHRINK) != 0; - table_child->xfill = (g_value_get_flags (value) & GTK_FILL) != 0; - } - break; - case CHILD_PROP_Y_OPTIONS: - { - table_child->yexpand = (g_value_get_flags (value) & GTK_EXPAND) != 0; - table_child->yshrink = (g_value_get_flags (value) & GTK_SHRINK) != 0; - table_child->yfill = (g_value_get_flags (value) & GTK_FILL) != 0; - } - break; - case CHILD_PROP_X_PADDING: - table_child->xpadding = g_value_get_uint (value); - break; - case CHILD_PROP_Y_PADDING: - table_child->ypadding = g_value_get_uint (value); - break; - default: - GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec); - break; - } - if (gtk_widget_get_visible (child) && - gtk_widget_get_visible (GTK_WIDGET (table))) - gtk_widget_queue_resize (child); -} - -static void -gtk_table_get_child_property (GtkContainer *container, - GtkWidget *child, - guint property_id, - GValue *value, - GParamSpec *pspec) -{ - GtkTable *table = GTK_TABLE (container); - GtkTablePrivate *priv = table->priv; - GtkTableChild *table_child; - GList *list; - - table_child = NULL; - for (list = priv->children; list; list = list->next) - { - table_child = list->data; - - if (table_child->widget == child) - break; - } - if (!list) - { - GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec); - return; - } - - switch (property_id) - { - case CHILD_PROP_LEFT_ATTACH: - g_value_set_uint (value, table_child->left_attach); - break; - case CHILD_PROP_RIGHT_ATTACH: - g_value_set_uint (value, table_child->right_attach); - break; - case CHILD_PROP_TOP_ATTACH: - g_value_set_uint (value, table_child->top_attach); - break; - case CHILD_PROP_BOTTOM_ATTACH: - g_value_set_uint (value, table_child->bottom_attach); - break; - case CHILD_PROP_X_OPTIONS: - g_value_set_flags (value, (table_child->xexpand * GTK_EXPAND | - table_child->xshrink * GTK_SHRINK | - table_child->xfill * GTK_FILL)); - break; - case CHILD_PROP_Y_OPTIONS: - g_value_set_flags (value, (table_child->yexpand * GTK_EXPAND | - table_child->yshrink * GTK_SHRINK | - table_child->yfill * GTK_FILL)); - break; - case CHILD_PROP_X_PADDING: - g_value_set_uint (value, table_child->xpadding); - break; - case CHILD_PROP_Y_PADDING: - g_value_set_uint (value, table_child->ypadding); - break; - default: - GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec); - break; - } -} - -static void -gtk_table_init (GtkTable *table) -{ - GtkTablePrivate *priv; - - table->priv = gtk_table_get_instance_private (table); - priv = table->priv; - - gtk_widget_set_has_window (GTK_WIDGET (table), FALSE); - gtk_widget_set_redraw_on_allocate (GTK_WIDGET (table), FALSE); - - priv->children = NULL; - priv->rows = NULL; - priv->cols = NULL; - priv->nrows = 0; - priv->ncols = 0; - priv->column_spacing = 0; - priv->row_spacing = 0; - priv->homogeneous = FALSE; - - gtk_table_resize (table, 1, 1); -} - -/** - * gtk_table_new: - * @rows: The number of rows the new table should have. - * @columns: The number of columns the new table should have. - * @homogeneous: If set to %TRUE, all table cells are resized to the size of - * the cell containing the largest widget. - * - * Used to create a new table widget. An initial size must be given by - * specifying how many rows and columns the table should have, although - * this can be changed later with gtk_table_resize(). @rows and @columns - * must both be in the range 1 .. 65535. For historical reasons, 0 is accepted - * as well and is silently interpreted as 1. - * - * Returns: A pointer to the newly created table widget. - * - * Deprecated: 3.4: Use gtk_grid_new(). - */ -GtkWidget* -gtk_table_new (guint rows, - guint columns, - gboolean homogeneous) -{ - GtkTable *table; - GtkTablePrivate *priv; - - if (rows == 0) - rows = 1; - if (columns == 0) - columns = 1; - - table = g_object_new (GTK_TYPE_TABLE, NULL); - priv = table->priv; - - priv->homogeneous = (homogeneous ? TRUE : FALSE); - - gtk_table_resize (table, rows, columns); - - return GTK_WIDGET (table); -} - -/** - * gtk_table_resize: - * @table: The #GtkTable you wish to change the size of. - * @rows: The new number of rows. - * @columns: The new number of columns. - * - * If you need to change a table’s size after - * it has been created, this function allows you to do so. - * - * Deprecated: 3.4: #GtkGrid resizes automatically. - */ -void -gtk_table_resize (GtkTable *table, - guint n_rows, - guint n_cols) -{ - GtkTablePrivate *priv; - - g_return_if_fail (GTK_IS_TABLE (table)); - g_return_if_fail (n_rows > 0 && n_rows <= 65535); - g_return_if_fail (n_cols > 0 && n_cols <= 65535); - - priv = table->priv; - - n_rows = MAX (n_rows, 1); - n_cols = MAX (n_cols, 1); - - if (n_rows != priv->nrows || - n_cols != priv->ncols) - { - GList *list; - - for (list = priv->children; list; list = list->next) - { - GtkTableChild *child; - - child = list->data; - - n_rows = MAX (n_rows, child->bottom_attach); - n_cols = MAX (n_cols, child->right_attach); - } - - if (n_rows != priv->nrows) - { - guint i; - - i = priv->nrows; - priv->nrows = n_rows; - priv->rows = g_realloc (priv->rows, priv->nrows * sizeof (GtkTableRowCol)); - - for (; i < priv->nrows; i++) - { - priv->rows[i].requisition = 0; - priv->rows[i].allocation = 0; - priv->rows[i].spacing = priv->row_spacing; - priv->rows[i].need_expand = 0; - priv->rows[i].need_shrink = 0; - priv->rows[i].expand = 0; - priv->rows[i].shrink = 0; - } - - g_object_notify (G_OBJECT (table), "n-rows"); - } - - if (n_cols != priv->ncols) - { - guint i; - - i = priv->ncols; - priv->ncols = n_cols; - priv->cols = g_realloc (priv->cols, priv->ncols * sizeof (GtkTableRowCol)); - - for (; i < priv->ncols; i++) - { - priv->cols[i].requisition = 0; - priv->cols[i].allocation = 0; - priv->cols[i].spacing = priv->column_spacing; - priv->cols[i].need_expand = 0; - priv->cols[i].need_shrink = 0; - priv->cols[i].expand = 0; - priv->cols[i].shrink = 0; - } - - g_object_notify (G_OBJECT (table), "n-columns"); - } - } -} - -/** - * gtk_table_attach: - * @table: The #GtkTable to add a new widget to. - * @child: The widget to add. - * @left_attach: the column number to attach the left side of a child widget to. - * @right_attach: the column number to attach the right side of a child widget to. - * @top_attach: the row number to attach the top of a child widget to. - * @bottom_attach: the row number to attach the bottom of a child widget to. - * @xoptions: Used to specify the properties of the child widget when the table is resized. - * @yoptions: The same as xoptions, except this field determines behaviour of vertical resizing. - * @xpadding: An integer value specifying the padding on the left and right of the widget being added to the table. - * @ypadding: The amount of padding above and below the child widget. - * - * Adds a widget to a table. The number of “cells” that a widget will occupy is - * specified by @left_attach, @right_attach, @top_attach and @bottom_attach. - * These each represent the leftmost, rightmost, uppermost and lowest column - * and row numbers of the table. (Columns and rows are indexed from zero). - * - * To make a button occupy the lower right cell of a 2x2 table, use - * |[ - * gtk_table_attach (table, button, - * 1, 2, // left, right attach - * 1, 2, // top, bottom attach - * xoptions, yoptions, - * xpadding, ypadding); - * ]| - * If you want to make the button span the entire bottom row, use @left_attach == 0 and @right_attach = 2 instead. - * - * Deprecated: 3.4: Use gtk_grid_attach() with #GtkGrid. Note that the attach - * arguments differ between those two functions. - */ -void -gtk_table_attach (GtkTable *table, - GtkWidget *child, - guint left_attach, - guint right_attach, - guint top_attach, - guint bottom_attach, - GtkAttachOptions xoptions, - GtkAttachOptions yoptions, - guint xpadding, - guint ypadding) -{ - GtkTablePrivate *priv; - GtkTableChild *table_child; - - g_return_if_fail (GTK_IS_TABLE (table)); - g_return_if_fail (GTK_IS_WIDGET (child)); - g_return_if_fail (gtk_widget_get_parent (child) == NULL); - - /* g_return_if_fail (left_attach >= 0); */ - g_return_if_fail (left_attach < right_attach); - /* g_return_if_fail (top_attach >= 0); */ - g_return_if_fail (top_attach < bottom_attach); - - priv = table->priv; - - if (right_attach >= priv->ncols) - gtk_table_resize (table, priv->nrows, right_attach); - - if (bottom_attach >= priv->nrows) - gtk_table_resize (table, bottom_attach, priv->ncols); - - table_child = g_new (GtkTableChild, 1); - table_child->widget = child; - table_child->left_attach = left_attach; - table_child->right_attach = right_attach; - table_child->top_attach = top_attach; - table_child->bottom_attach = bottom_attach; - table_child->xexpand = (xoptions & GTK_EXPAND) != 0; - table_child->xshrink = (xoptions & GTK_SHRINK) != 0; - table_child->xfill = (xoptions & GTK_FILL) != 0; - table_child->xpadding = xpadding; - table_child->yexpand = (yoptions & GTK_EXPAND) != 0; - table_child->yshrink = (yoptions & GTK_SHRINK) != 0; - table_child->yfill = (yoptions & GTK_FILL) != 0; - table_child->ypadding = ypadding; - - priv->children = g_list_prepend (priv->children, table_child); - - gtk_widget_set_parent (child, GTK_WIDGET (table)); -} - -/** - * gtk_table_attach_defaults: - * @table: The table to add a new child widget to. - * @widget: The child widget to add. - * @left_attach: The column number to attach the left side of the child widget to. - * @right_attach: The column number to attach the right side of the child widget to. - * @top_attach: The row number to attach the top of the child widget to. - * @bottom_attach: The row number to attach the bottom of the child widget to. - * - * As there are many options associated with gtk_table_attach(), this convenience - * function provides the programmer with a means to add children to a table with - * identical padding and expansion options. The values used for the #GtkAttachOptions - * are `GTK_EXPAND | GTK_FILL`, and the padding is set to 0. - * - * Deprecated: 3.4: Use gtk_grid_attach() with #GtkGrid. Note that the attach - * arguments differ between those two functions. - */ -void -gtk_table_attach_defaults (GtkTable *table, - GtkWidget *widget, - guint left_attach, - guint right_attach, - guint top_attach, - guint bottom_attach) -{ - gtk_table_attach (table, widget, - left_attach, right_attach, - top_attach, bottom_attach, - GTK_EXPAND | GTK_FILL, - GTK_EXPAND | GTK_FILL, - 0, 0); -} - -/** - * gtk_table_set_row_spacing: - * @table: a #GtkTable containing the row whose properties you wish to change. - * @row: row number whose spacing will be changed. - * @spacing: number of pixels that the spacing should take up. - * - * Changes the space between a given table row and the subsequent row. - * - * Deprecated: 3.4: Use gtk_widget_set_margin_top() and - * gtk_widget_set_margin_bottom() on the widgets contained in the row if - * you need this functionality. #GtkGrid does not support per-row spacing. - */ -void -gtk_table_set_row_spacing (GtkTable *table, - guint row, - guint spacing) -{ - GtkTablePrivate *priv; - - g_return_if_fail (GTK_IS_TABLE (table)); - - priv = table->priv; - - g_return_if_fail (row < priv->nrows); - - if (priv->rows[row].spacing != spacing) - { - priv->rows[row].spacing = spacing; - - if (gtk_widget_get_visible (GTK_WIDGET (table))) - gtk_widget_queue_resize (GTK_WIDGET (table)); - } -} - -/** - * gtk_table_get_row_spacing: - * @table: a #GtkTable - * @row: a row in the table, 0 indicates the first row - * - * Gets the amount of space between row @row, and - * row @row + 1. See gtk_table_set_row_spacing(). - * - * Returns: the row spacing - * - * Deprecated: 3.4: #GtkGrid does not offer a replacement for this - * functionality. - **/ -guint -gtk_table_get_row_spacing (GtkTable *table, - guint row) -{ - GtkTablePrivate *priv; - - g_return_val_if_fail (GTK_IS_TABLE (table), 0); - - priv = table->priv; - - g_return_val_if_fail (row < priv->nrows - 1, 0); - - return priv->rows[row].spacing; -} - -/** - * gtk_table_set_col_spacing: - * @table: a #GtkTable. - * @column: the column whose spacing should be changed. - * @spacing: number of pixels that the spacing should take up. - * - * Alters the amount of space between a given table column and the following - * column. - * - * Deprecated: 3.4: Use gtk_widget_set_margin_start() and - * gtk_widget_set_margin_end() on the widgets contained in the row if - * you need this functionality. #GtkGrid does not support per-row spacing. - */ -void -gtk_table_set_col_spacing (GtkTable *table, - guint column, - guint spacing) -{ - GtkTablePrivate *priv; - - g_return_if_fail (GTK_IS_TABLE (table)); - - priv = table->priv; - - g_return_if_fail (column < priv->ncols); - - if (priv->cols[column].spacing != spacing) - { - priv->cols[column].spacing = spacing; - - if (gtk_widget_get_visible (GTK_WIDGET (table))) - gtk_widget_queue_resize (GTK_WIDGET (table)); - } -} - -/** - * gtk_table_get_col_spacing: - * @table: a #GtkTable - * @column: a column in the table, 0 indicates the first column - * - * Gets the amount of space between column @col, and - * column @col + 1. See gtk_table_set_col_spacing(). - * - * Returns: the column spacing - * - * Deprecated: 3.4: #GtkGrid does not offer a replacement for this - * functionality. - **/ -guint -gtk_table_get_col_spacing (GtkTable *table, - guint column) -{ - GtkTablePrivate *priv; - - g_return_val_if_fail (GTK_IS_TABLE (table), 0); - - priv = table->priv; - - g_return_val_if_fail (column < priv->ncols, 0); - - return priv->cols[column].spacing; -} - -/** - * gtk_table_set_row_spacings: - * @table: a #GtkTable. - * @spacing: the number of pixels of space to place between every row in the table. - * - * Sets the space between every row in @table equal to @spacing. - * - * Deprecated: 3.4: Use gtk_grid_set_row_spacing() with #GtkGrid. - */ -void -gtk_table_set_row_spacings (GtkTable *table, - guint spacing) -{ - GtkTablePrivate *priv; - guint row; - - g_return_if_fail (GTK_IS_TABLE (table)); - - priv = table->priv; - - priv->row_spacing = spacing; - for (row = 0; row < priv->nrows; row++) - priv->rows[row].spacing = spacing; - - if (gtk_widget_get_visible (GTK_WIDGET (table))) - gtk_widget_queue_resize (GTK_WIDGET (table)); - - g_object_notify (G_OBJECT (table), "row-spacing"); -} - -/** - * gtk_table_get_default_row_spacing: - * @table: a #GtkTable - * - * Gets the default row spacing for the table. This is - * the spacing that will be used for newly added rows. - * (See gtk_table_set_row_spacings()) - * - * Returns: the default row spacing - * - * Deprecated: 3.4: Use gtk_grid_get_row_spacing() with #GtkGrid. - **/ -guint -gtk_table_get_default_row_spacing (GtkTable *table) -{ - g_return_val_if_fail (GTK_IS_TABLE (table), 0); - - return table->priv->row_spacing; -} - -/** - * gtk_table_set_col_spacings: - * @table: a #GtkTable. - * @spacing: the number of pixels of space to place between every column - * in the table. - * - * Sets the space between every column in @table equal to @spacing. - * - * Deprecated: 3.4: Use gtk_grid_set_column_spacing() with #GtkGrid. - */ -void -gtk_table_set_col_spacings (GtkTable *table, - guint spacing) -{ - GtkTablePrivate *priv; - guint col; - - g_return_if_fail (GTK_IS_TABLE (table)); - - priv = table->priv; - - priv->column_spacing = spacing; - for (col = 0; col < priv->ncols; col++) - priv->cols[col].spacing = spacing; - - if (gtk_widget_get_visible (GTK_WIDGET (table))) - gtk_widget_queue_resize (GTK_WIDGET (table)); - - g_object_notify (G_OBJECT (table), "column-spacing"); -} - -/** - * gtk_table_get_default_col_spacing: - * @table: a #GtkTable - * - * Gets the default column spacing for the table. This is - * the spacing that will be used for newly added columns. - * (See gtk_table_set_col_spacings()) - * - * Returns: the default column spacing - * - * Deprecated: 3.4: Use gtk_grid_get_column_spacing() with #GtkGrid. - **/ -guint -gtk_table_get_default_col_spacing (GtkTable *table) -{ - g_return_val_if_fail (GTK_IS_TABLE (table), 0); - - return table->priv->column_spacing; -} - -/** - * gtk_table_set_homogeneous: - * @table: The #GtkTable you wish to set the homogeneous properties of. - * @homogeneous: Set to %TRUE to ensure all table cells are the same size. Set - * to %FALSE if this is not your desired behaviour. - * - * Changes the homogenous property of table cells, ie. whether all cells are - * an equal size or not. - * - * Deprecated: 3.4: Use gtk_grid_set_row_homogeneous() and - * gtk_grid_set_column_homogeneous() with #GtkGrid. - */ -void -gtk_table_set_homogeneous (GtkTable *table, - gboolean homogeneous) -{ - GtkTablePrivate *priv; - - g_return_if_fail (GTK_IS_TABLE (table)); - - priv = table->priv; - - homogeneous = (homogeneous != 0); - if (homogeneous != priv->homogeneous) - { - priv->homogeneous = homogeneous; - - if (gtk_widget_get_visible (GTK_WIDGET (table))) - gtk_widget_queue_resize (GTK_WIDGET (table)); - - g_object_notify (G_OBJECT (table), "homogeneous"); - } -} - -/** - * gtk_table_get_homogeneous: - * @table: a #GtkTable - * - * Returns whether the table cells are all constrained to the same - * width and height. (See gtk_table_set_homogeneous ()) - * - * Returns: %TRUE if the cells are all constrained to the same size - * - * Deprecated: 3.4: Use gtk_grid_get_row_homogeneous() and - * gtk_grid_get_column_homogeneous() with #GtkGrid. - **/ -gboolean -gtk_table_get_homogeneous (GtkTable *table) -{ - g_return_val_if_fail (GTK_IS_TABLE (table), FALSE); - - return table->priv->homogeneous; -} - -/** - * gtk_table_get_size: - * @table: a #GtkTable - * @rows: (out) (allow-none): return location for the number of - * rows, or %NULL - * @columns: (out) (allow-none): return location for the number - * of columns, or %NULL - * - * Gets the number of rows and columns in the table. - * - * Since: 2.22 - * - * Deprecated: 3.4: #GtkGrid does not expose the number of columns and - * rows. - **/ -void -gtk_table_get_size (GtkTable *table, - guint *rows, - guint *columns) -{ - GtkTablePrivate *priv; - - g_return_if_fail (GTK_IS_TABLE (table)); - - priv = table->priv; - - if (rows) - *rows = priv->nrows; - - if (columns) - *columns = priv->ncols; -} - -static void -gtk_table_finalize (GObject *object) -{ - GtkTable *table = GTK_TABLE (object); - GtkTablePrivate *priv = table->priv; - - g_free (priv->rows); - g_free (priv->cols); - - G_OBJECT_CLASS (gtk_table_parent_class)->finalize (object); -} - -static void -gtk_table_get_preferred_width (GtkWidget *widget, - gint *minimum, - gint *natural) -{ - GtkTable *table = GTK_TABLE (widget); - GtkTablePrivate *priv = table->priv; - gint col; - - gtk_table_size_request_init (table); - gtk_table_size_request_pass1 (table); - gtk_table_size_request_pass2 (table); - gtk_table_size_request_pass3 (table); - gtk_table_size_request_pass2 (table); - - *minimum = 0; - - for (col = 0; col < priv->ncols; col++) - *minimum += priv->cols[col].requisition; - for (col = 0; col + 1 < priv->ncols; col++) - *minimum += priv->cols[col].spacing; - - *natural = *minimum; -} - -static void -gtk_table_get_preferred_height (GtkWidget *widget, - gint *minimum, - gint *natural) -{ - GtkTable *table = GTK_TABLE (widget); - GtkTablePrivate *priv = table->priv; - gint row; - - gtk_table_size_request_init (table); - gtk_table_size_request_pass1 (table); - gtk_table_size_request_pass2 (table); - gtk_table_size_request_pass3 (table); - gtk_table_size_request_pass2 (table); - - *minimum = 0; - for (row = 0; row < priv->nrows; row++) - *minimum += priv->rows[row].requisition; - for (row = 0; row + 1 < priv->nrows; row++) - *minimum += priv->rows[row].spacing; - - *natural = *minimum; -} - -static void -gtk_table_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - GtkTable *table = GTK_TABLE (widget); - - gtk_widget_set_allocation (widget, allocation); - - gtk_table_size_allocate_init (table); - gtk_table_size_allocate_pass1 (table); - gtk_table_size_allocate_pass2 (table); -} - -static void -gtk_table_add (GtkContainer *container, - GtkWidget *widget) -{ - gtk_table_attach_defaults (GTK_TABLE (container), widget, 0, 1, 0, 1); -} - -static void -gtk_table_remove (GtkContainer *container, - GtkWidget *widget) -{ - GtkTable *table = GTK_TABLE (container); - GtkTablePrivate *priv = table->priv; - GtkTableChild *child; - GtkWidget *widget_container = GTK_WIDGET (container); - GList *children; - - children = priv->children; - - while (children) - { - child = children->data; - children = children->next; - - if (child->widget == widget) - { - gboolean was_visible = gtk_widget_get_visible (widget); - - gtk_widget_unparent (widget); - - priv->children = g_list_remove (priv->children, child); - g_free (child); - - if (was_visible && gtk_widget_get_visible (widget_container)) - gtk_widget_queue_resize (widget_container); - break; - } - } -} - -static void -gtk_table_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data) -{ - GtkTable *table = GTK_TABLE (container); - GtkTablePrivate *priv = table->priv; - GtkTableChild *child; - GList *children; - - children = priv->children; - - while (children) - { - child = children->data; - children = children->next; - - (* callback) (child->widget, callback_data); - } -} - -static void -gtk_table_size_request_init (GtkTable *table) -{ - GtkTablePrivate *priv = table->priv; - GtkTableChild *child; - GList *children; - gint row, col; - - for (row = 0; row < priv->nrows; row++) - { - priv->rows[row].requisition = 0; - priv->rows[row].expand = FALSE; - } - for (col = 0; col < priv->ncols; col++) - { - priv->cols[col].requisition = 0; - priv->cols[col].expand = FALSE; - } - - children = priv->children; - while (children) - { - child = children->data; - children = children->next; - - if (child->left_attach == (child->right_attach - 1) && - (child->xexpand || gtk_widget_compute_expand (child->widget, GTK_ORIENTATION_HORIZONTAL))) - priv->cols[child->left_attach].expand = TRUE; - - if (child->top_attach == (child->bottom_attach - 1) && - (child->yexpand || gtk_widget_compute_expand (child->widget, GTK_ORIENTATION_VERTICAL))) - priv->rows[child->top_attach].expand = TRUE; - } -} - -static void -gtk_table_size_request_pass1 (GtkTable *table) -{ - GtkTablePrivate *priv = table->priv; - GtkTableChild *child; - GList *children; - gint width; - gint height; - - children = priv->children; - while (children) - { - child = children->data; - children = children->next; - - if (gtk_widget_get_visible (child->widget)) - { - GtkRequisition child_requisition; - - gtk_widget_get_preferred_size (child->widget, &child_requisition, NULL); - - /* Child spans a single column. - */ - if (child->left_attach == (child->right_attach - 1)) - { - width = child_requisition.width + child->xpadding * 2; - priv->cols[child->left_attach].requisition = MAX (priv->cols[child->left_attach].requisition, width); - } - - /* Child spans a single row. - */ - if (child->top_attach == (child->bottom_attach - 1)) - { - height = child_requisition.height + child->ypadding * 2; - priv->rows[child->top_attach].requisition = MAX (priv->rows[child->top_attach].requisition, height); - } - } - } -} - -static void -gtk_table_size_request_pass2 (GtkTable *table) -{ - GtkTablePrivate *priv = table->priv; - gint max_width; - gint max_height; - gint row, col; - - if (priv->homogeneous) - { - max_width = 0; - max_height = 0; - - for (col = 0; col < priv->ncols; col++) - max_width = MAX (max_width, priv->cols[col].requisition); - for (row = 0; row < priv->nrows; row++) - max_height = MAX (max_height, priv->rows[row].requisition); - - for (col = 0; col < priv->ncols; col++) - priv->cols[col].requisition = max_width; - for (row = 0; row < priv->nrows; row++) - priv->rows[row].requisition = max_height; - } -} - -static void -gtk_table_size_request_pass3 (GtkTable *table) -{ - GtkTablePrivate *priv = table->priv; - GtkTableChild *child; - GList *children; - gint width, height; - gint row, col; - gint extra; - - children = priv->children; - while (children) - { - child = children->data; - children = children->next; - - if (gtk_widget_get_visible (child->widget)) - { - /* Child spans multiple columns. - */ - if (child->left_attach != (child->right_attach - 1)) - { - GtkRequisition child_requisition; - - gtk_widget_get_preferred_size (child->widget, - &child_requisition, NULL); - - /* Check and see if there is already enough space - * for the child. - */ - width = 0; - for (col = child->left_attach; col < child->right_attach; col++) - { - width += priv->cols[col].requisition; - if ((col + 1) < child->right_attach) - width += priv->cols[col].spacing; - } - - /* If we need to request more space for this child to fill - * its requisition, then divide up the needed space amongst the - * columns it spans, favoring expandable columns if any. - */ - if (width < child_requisition.width + child->xpadding * 2) - { - gint n_expand = 0; - gboolean force_expand = FALSE; - - width = child_requisition.width + child->xpadding * 2 - width; - - for (col = child->left_attach; col < child->right_attach; col++) - if (priv->cols[col].expand) - n_expand++; - - if (n_expand == 0) - { - n_expand = (child->right_attach - child->left_attach); - force_expand = TRUE; - } - - for (col = child->left_attach; col < child->right_attach; col++) - if (force_expand || priv->cols[col].expand) - { - extra = width / n_expand; - priv->cols[col].requisition += extra; - width -= extra; - n_expand--; - } - } - } - - /* Child spans multiple rows. - */ - if (child->top_attach != (child->bottom_attach - 1)) - { - GtkRequisition child_requisition; - - gtk_widget_get_preferred_size (child->widget, - &child_requisition, NULL); - - /* Check and see if there is already enough space - * for the child. - */ - height = 0; - for (row = child->top_attach; row < child->bottom_attach; row++) - { - height += priv->rows[row].requisition; - if ((row + 1) < child->bottom_attach) - height += priv->rows[row].spacing; - } - - /* If we need to request more space for this child to fill - * its requisition, then divide up the needed space amongst the - * rows it spans, favoring expandable rows if any. - */ - if (height < child_requisition.height + child->ypadding * 2) - { - gint n_expand = 0; - gboolean force_expand = FALSE; - - height = child_requisition.height + child->ypadding * 2 - height; - - for (row = child->top_attach; row < child->bottom_attach; row++) - { - if (priv->rows[row].expand) - n_expand++; - } - - if (n_expand == 0) - { - n_expand = (child->bottom_attach - child->top_attach); - force_expand = TRUE; - } - - for (row = child->top_attach; row < child->bottom_attach; row++) - if (force_expand || priv->rows[row].expand) - { - extra = height / n_expand; - priv->rows[row].requisition += extra; - height -= extra; - n_expand--; - } - } - } - } - } -} - -static void -gtk_table_size_allocate_init (GtkTable *table) -{ - GtkTablePrivate *priv = table->priv; - GtkTableChild *child; - GList *children; - gint row, col; - gint has_expand; - gint has_shrink; - - /* Initialize the rows and cols. - * By default, rows and cols do not expand and do shrink. - * Those values are modified by the children that occupy - * the rows and cols. - */ - for (col = 0; col < priv->ncols; col++) - { - priv->cols[col].allocation = priv->cols[col].requisition; - priv->cols[col].need_expand = FALSE; - priv->cols[col].need_shrink = TRUE; - priv->cols[col].expand = FALSE; - priv->cols[col].shrink = TRUE; - priv->cols[col].empty = TRUE; - } - for (row = 0; row < priv->nrows; row++) - { - priv->rows[row].allocation = priv->rows[row].requisition; - priv->rows[row].need_expand = FALSE; - priv->rows[row].need_shrink = TRUE; - priv->rows[row].expand = FALSE; - priv->rows[row].shrink = TRUE; - priv->rows[row].empty = TRUE; - } - - /* Loop over all the children and adjust the row and col values - * based on whether the children want to be allowed to expand - * or shrink. This loop handles children that occupy a single - * row or column. - */ - children = priv->children; - while (children) - { - child = children->data; - children = children->next; - - if (gtk_widget_get_visible (child->widget)) - { - if (child->left_attach == (child->right_attach - 1)) - { - if (child->xexpand || gtk_widget_compute_expand (child->widget, GTK_ORIENTATION_HORIZONTAL)) - priv->cols[child->left_attach].expand = TRUE; - - if (!child->xshrink) - priv->cols[child->left_attach].shrink = FALSE; - - priv->cols[child->left_attach].empty = FALSE; - } - - if (child->top_attach == (child->bottom_attach - 1)) - { - if (child->yexpand || gtk_widget_compute_expand (child->widget, GTK_ORIENTATION_VERTICAL)) - priv->rows[child->top_attach].expand = TRUE; - - if (!child->yshrink) - priv->rows[child->top_attach].shrink = FALSE; - - priv->rows[child->top_attach].empty = FALSE; - } - } - } - - /* Loop over all the children again and this time handle children - * which span multiple rows or columns. - */ - children = priv->children; - while (children) - { - child = children->data; - children = children->next; - - if (gtk_widget_get_visible (child->widget)) - { - if (child->left_attach != (child->right_attach - 1)) - { - for (col = child->left_attach; col < child->right_attach; col++) - priv->cols[col].empty = FALSE; - - if (child->xexpand) - { - has_expand = FALSE; - for (col = child->left_attach; col < child->right_attach; col++) - if (priv->cols[col].expand) - { - has_expand = TRUE; - break; - } - - if (!has_expand) - for (col = child->left_attach; col < child->right_attach; col++) - priv->cols[col].need_expand = TRUE; - } - - if (!child->xshrink) - { - has_shrink = TRUE; - for (col = child->left_attach; col < child->right_attach; col++) - if (!priv->cols[col].shrink) - { - has_shrink = FALSE; - break; - } - - if (has_shrink) - for (col = child->left_attach; col < child->right_attach; col++) - priv->cols[col].need_shrink = FALSE; - } - } - - if (child->top_attach != (child->bottom_attach - 1)) - { - for (row = child->top_attach; row < child->bottom_attach; row++) - priv->rows[row].empty = FALSE; - - if (child->yexpand) - { - has_expand = FALSE; - for (row = child->top_attach; row < child->bottom_attach; row++) - if (priv->rows[row].expand) - { - has_expand = TRUE; - break; - } - - if (!has_expand) - for (row = child->top_attach; row < child->bottom_attach; row++) - priv->rows[row].need_expand = TRUE; - } - - if (!child->yshrink) - { - has_shrink = TRUE; - for (row = child->top_attach; row < child->bottom_attach; row++) - if (!priv->rows[row].shrink) - { - has_shrink = FALSE; - break; - } - - if (has_shrink) - for (row = child->top_attach; row < child->bottom_attach; row++) - priv->rows[row].need_shrink = FALSE; - } - } - } - } - - /* Loop over the columns and set the expand and shrink values - * if the column can be expanded or shrunk. - */ - for (col = 0; col < priv->ncols; col++) - { - if (priv->cols[col].empty) - { - priv->cols[col].expand = FALSE; - priv->cols[col].shrink = FALSE; - } - else - { - if (priv->cols[col].need_expand) - priv->cols[col].expand = TRUE; - if (!priv->cols[col].need_shrink) - priv->cols[col].shrink = FALSE; - } - } - - /* Loop over the rows and set the expand and shrink values - * if the row can be expanded or shrunk. - */ - for (row = 0; row < priv->nrows; row++) - { - if (priv->rows[row].empty) - { - priv->rows[row].expand = FALSE; - priv->rows[row].shrink = FALSE; - } - else - { - if (priv->rows[row].need_expand) - priv->rows[row].expand = TRUE; - if (!priv->rows[row].need_shrink) - priv->rows[row].shrink = FALSE; - } - } -} - -static void -gtk_table_size_allocate_pass1 (GtkTable *table) -{ - GtkTablePrivate *priv = table->priv; - GtkAllocation allocation; - gint real_width; - gint real_height; - gint width, height; - gint row, col; - gint nexpand; - gint nshrink; - gint extra; - - /* If we were allocated more space than we requested - * then we have to expand any expandable rows and columns - * to fill in the extra space. - */ - gtk_widget_get_allocation (GTK_WIDGET (table), &allocation); - real_width = allocation.width; - real_height = allocation.height; - - if (priv->homogeneous) - { - if (!priv->children) - nexpand = 1; - else - { - nexpand = 0; - for (col = 0; col < priv->ncols; col++) - if (priv->cols[col].expand) - { - nexpand += 1; - break; - } - } - if (nexpand) - { - width = real_width; - for (col = 0; col + 1 < priv->ncols; col++) - width -= priv->cols[col].spacing; - - for (col = 0; col < priv->ncols; col++) - { - extra = width / (priv->ncols - col); - priv->cols[col].allocation = MAX (1, extra); - width -= extra; - } - } - } - else - { - width = 0; - nexpand = 0; - nshrink = 0; - - for (col = 0; col < priv->ncols; col++) - { - width += priv->cols[col].requisition; - if (priv->cols[col].expand) - nexpand += 1; - if (priv->cols[col].shrink) - nshrink += 1; - } - for (col = 0; col + 1 < priv->ncols; col++) - width += priv->cols[col].spacing; - - /* Check to see if we were allocated more width than we requested. - */ - if ((width < real_width) && (nexpand >= 1)) - { - width = real_width - width; - - for (col = 0; col < priv->ncols; col++) - if (priv->cols[col].expand) - { - extra = width / nexpand; - priv->cols[col].allocation += extra; - - width -= extra; - nexpand -= 1; - } - } - - /* Check to see if we were allocated less width than we requested, - * then shrink until we fit the size give. - */ - if (width > real_width) - { - gint total_nshrink = nshrink; - - extra = width - real_width; - while (total_nshrink > 0 && extra > 0) - { - nshrink = total_nshrink; - for (col = 0; col < priv->ncols; col++) - if (priv->cols[col].shrink) - { - gint alloc = priv->cols[col].allocation; - - priv->cols[col].allocation = MAX (1, (gint) priv->cols[col].allocation - extra / nshrink); - extra -= alloc - priv->cols[col].allocation; - nshrink -= 1; - if (priv->cols[col].allocation < 2) - { - total_nshrink -= 1; - priv->cols[col].shrink = FALSE; - } - } - } - } - } - - if (priv->homogeneous) - { - if (!priv->children) - nexpand = 1; - else - { - nexpand = 0; - for (row = 0; row < priv->nrows; row++) - if (priv->rows[row].expand) - { - nexpand += 1; - break; - } - } - if (nexpand) - { - height = real_height; - - for (row = 0; row + 1 < priv->nrows; row++) - height -= priv->rows[row].spacing; - - for (row = 0; row < priv->nrows; row++) - { - extra = height / (priv->nrows - row); - priv->rows[row].allocation = MAX (1, extra); - height -= extra; - } - } - } - else - { - height = 0; - nexpand = 0; - nshrink = 0; - - for (row = 0; row < priv->nrows; row++) - { - height += priv->rows[row].requisition; - if (priv->rows[row].expand) - nexpand += 1; - if (priv->rows[row].shrink) - nshrink += 1; - } - for (row = 0; row + 1 < priv->nrows; row++) - height += priv->rows[row].spacing; - - /* Check to see if we were allocated more height than we requested. - */ - if ((height < real_height) && (nexpand >= 1)) - { - height = real_height - height; - - for (row = 0; row < priv->nrows; row++) - if (priv->rows[row].expand) - { - extra = height / nexpand; - priv->rows[row].allocation += extra; - - height -= extra; - nexpand -= 1; - } - } - - /* Check to see if we were allocated less height than we requested. - * then shrink until we fit the size give. - */ - if (height > real_height) - { - gint total_nshrink = nshrink; - - extra = height - real_height; - while (total_nshrink > 0 && extra > 0) - { - nshrink = total_nshrink; - for (row = 0; row < priv->nrows; row++) - if (priv->rows[row].shrink) - { - gint alloc = priv->rows[row].allocation; - - priv->rows[row].allocation = MAX (1, (gint) priv->rows[row].allocation - extra / nshrink); - extra -= alloc - priv->rows[row].allocation; - nshrink -= 1; - if (priv->rows[row].allocation < 2) - { - total_nshrink -= 1; - priv->rows[row].shrink = FALSE; - } - } - } - } - } -} - -static void -gtk_table_size_allocate_pass2 (GtkTable *table) -{ - GtkTablePrivate *priv = table->priv; - GtkTableChild *child; - GList *children; - gint max_width; - gint max_height; - gint x, y; - gint row, col; - GtkAllocation allocation; - GtkAllocation table_allocation, widget_allocation; - GtkWidget *widget = GTK_WIDGET (table); - - children = priv->children; - while (children) - { - child = children->data; - children = children->next; - - if (gtk_widget_get_visible (child->widget)) - { - GtkRequisition child_requisition; - - gtk_widget_get_preferred_size (child->widget, - &child_requisition, NULL); - - gtk_widget_get_allocation (GTK_WIDGET (table), &table_allocation); - x = table_allocation.x; - y = table_allocation.y; - max_width = 0; - max_height = 0; - - for (col = 0; col < child->left_attach; col++) - { - x += priv->cols[col].allocation; - x += priv->cols[col].spacing; - } - - for (col = child->left_attach; col < child->right_attach; col++) - { - max_width += priv->cols[col].allocation; - if ((col + 1) < child->right_attach) - max_width += priv->cols[col].spacing; - } - - for (row = 0; row < child->top_attach; row++) - { - y += priv->rows[row].allocation; - y += priv->rows[row].spacing; - } - - for (row = child->top_attach; row < child->bottom_attach; row++) - { - max_height += priv->rows[row].allocation; - if ((row + 1) < child->bottom_attach) - max_height += priv->rows[row].spacing; - } - - if (child->xfill) - { - allocation.width = MAX (1, max_width - (gint)child->xpadding * 2); - allocation.x = x + (max_width - allocation.width) / 2; - } - else - { - allocation.width = child_requisition.width; - allocation.x = x + (max_width - allocation.width) / 2; - } - - if (child->yfill) - { - allocation.height = MAX (1, max_height - (gint)child->ypadding * 2); - allocation.y = y + (max_height - allocation.height) / 2; - } - else - { - allocation.height = child_requisition.height; - allocation.y = y + (max_height - allocation.height) / 2; - } - - gtk_widget_get_allocation (widget, &widget_allocation); - if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) - allocation.x = widget_allocation.x + widget_allocation.width - - (allocation.x - widget_allocation.x) - allocation.width; - - gtk_widget_size_allocate (child->widget, &allocation); - } - } -} diff --git a/gtk/deprecated/gtktable.h b/gtk/deprecated/gtktable.h deleted file mode 100644 index 903ea89de4..0000000000 --- a/gtk/deprecated/gtktable.h +++ /dev/null @@ -1,180 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GTK_TABLE_H__ -#define __GTK_TABLE_H__ - -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -#define GTK_TYPE_TABLE (gtk_table_get_type ()) -#define GTK_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TABLE, GtkTable)) -#define GTK_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TABLE, GtkTableClass)) -#define GTK_IS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TABLE)) -#define GTK_IS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TABLE)) -#define GTK_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TABLE, GtkTableClass)) - - -typedef struct _GtkTable GtkTable; -typedef struct _GtkTablePrivate GtkTablePrivate; -typedef struct _GtkTableClass GtkTableClass; -typedef struct _GtkTableChild GtkTableChild; -typedef struct _GtkTableRowCol GtkTableRowCol; - -struct _GtkTable -{ - GtkContainer container; - - /*< private >*/ - GtkTablePrivate *priv; -}; - -struct _GtkTableClass -{ - GtkContainerClass parent_class; - - /* Padding for future expansion */ - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); - void (*_gtk_reserved4) (void); -}; - -struct _GtkTableChild -{ - GtkWidget *widget; - guint16 left_attach; - guint16 right_attach; - guint16 top_attach; - guint16 bottom_attach; - guint16 xpadding; - guint16 ypadding; - guint xexpand : 1; - guint yexpand : 1; - guint xshrink : 1; - guint yshrink : 1; - guint xfill : 1; - guint yfill : 1; -}; - -struct _GtkTableRowCol -{ - guint16 requisition; - guint16 allocation; - guint16 spacing; - guint need_expand : 1; - guint need_shrink : 1; - guint expand : 1; - guint shrink : 1; - guint empty : 1; -}; - -/** - * GtkAttachOptions: - * @GTK_EXPAND: the widget should expand to take up any extra space in its - * container that has been allocated. - * @GTK_SHRINK: the widget should shrink as and when possible. - * @GTK_FILL: the widget should fill the space allocated to it. - * - * Denotes the expansion properties that a widget will have when it (or its - * parent) is resized. - */ -typedef enum -{ - GTK_EXPAND = 1 << 0, - GTK_SHRINK = 1 << 1, - GTK_FILL = 1 << 2 -} GtkAttachOptions; - - -GDK_DEPRECATED_IN_3_4 -GType gtk_table_get_type (void) G_GNUC_CONST; -GDK_DEPRECATED_IN_3_4_FOR(GtkGrid) -GtkWidget* gtk_table_new (guint rows, - guint columns, - gboolean homogeneous); -GDK_DEPRECATED_IN_3_4_FOR(GtkGrid) -void gtk_table_resize (GtkTable *table, - guint rows, - guint columns); -GDK_DEPRECATED_IN_3_4_FOR(GtkGrid) -void gtk_table_attach (GtkTable *table, - GtkWidget *child, - guint left_attach, - guint right_attach, - guint top_attach, - guint bottom_attach, - GtkAttachOptions xoptions, - GtkAttachOptions yoptions, - guint xpadding, - guint ypadding); -GDK_DEPRECATED_IN_3_4_FOR(GtkGrid) -void gtk_table_attach_defaults (GtkTable *table, - GtkWidget *widget, - guint left_attach, - guint right_attach, - guint top_attach, - guint bottom_attach); -GDK_DEPRECATED_IN_3_4_FOR(GtkGrid) -void gtk_table_set_row_spacing (GtkTable *table, - guint row, - guint spacing); -GDK_DEPRECATED_IN_3_4_FOR(GtkGrid) -guint gtk_table_get_row_spacing (GtkTable *table, - guint row); -GDK_DEPRECATED_IN_3_4_FOR(GtkGrid) -void gtk_table_set_col_spacing (GtkTable *table, - guint column, - guint spacing); -GDK_DEPRECATED_IN_3_4_FOR(GtkGrid) -guint gtk_table_get_col_spacing (GtkTable *table, - guint column); -GDK_DEPRECATED_IN_3_4_FOR(GtkGrid) -void gtk_table_set_row_spacings (GtkTable *table, - guint spacing); -GDK_DEPRECATED_IN_3_4_FOR(GtkGrid) -guint gtk_table_get_default_row_spacing (GtkTable *table); -GDK_DEPRECATED_IN_3_4_FOR(GtkGrid) -void gtk_table_set_col_spacings (GtkTable *table, - guint spacing); -GDK_DEPRECATED_IN_3_4_FOR(GtkGrid) -guint gtk_table_get_default_col_spacing (GtkTable *table); -GDK_DEPRECATED_IN_3_4_FOR(GtkGrid) -void gtk_table_set_homogeneous (GtkTable *table, - gboolean homogeneous); -GDK_DEPRECATED_IN_3_4_FOR(GtkGrid) -gboolean gtk_table_get_homogeneous (GtkTable *table); -GDK_DEPRECATED_IN_3_4_FOR(GtkGrid) -void gtk_table_get_size (GtkTable *table, - guint *rows, - guint *columns); - -G_END_DECLS - -#endif /* __GTK_TABLE_H__ */ diff --git a/gtk/gtk.h b/gtk/gtk.h index 04132bf136..610a920a61 100644 --- a/gtk/gtk.h +++ b/gtk/gtk.h @@ -253,7 +253,6 @@ #include #include #include -#include #include #include #endif /* GTK_DISABLE_DEPRECATED */ diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c index 31808d036a..b1e6289f13 100644 --- a/gtk/gtkgrid.c +++ b/gtk/gtkgrid.c @@ -36,10 +36,10 @@ * SECTION:gtkgrid * @Short_description: Pack widgets in a rows and columns * @Title: GtkGrid - * @See_also: #GtkTable, #GtkVBox + * @See_also: #GtkBox * * GtkGrid is a container which arranges its child widgets in - * rows and columns. It is a very similar to #GtkTable and #GtkBox, + * rows and columns. It is a very similar to #GtkBox, * but it consistently uses #GtkWidget’s #GtkWidget:margin and #GtkWidget:expand * properties instead of custom child properties, and it fully supports * [height-for-width geometry management][geometry-management]. diff --git a/testsuite/a11y/children.c b/testsuite/a11y/children.c index 21d280172d..f66a6a4290 100644 --- a/testsuite/a11y/children.c +++ b/testsuite/a11y/children.c @@ -253,7 +253,6 @@ main (int argc, char *argv[]) add_child_tests (gtk_assistant_new ()); add_child_tests (gtk_frame_new ("frame")); add_child_tests (gtk_expander_new ("expander")); - add_child_tests (gtk_table_new (2, 2, FALSE)); add_child_tests (gtk_text_view_new ()); add_child_tests (gtk_tree_view_new ()); #if 0 diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c index ca3e5d5708..1f9c6ec6c3 100644 --- a/testsuite/gtk/builder.c +++ b/testsuite/gtk/builder.c @@ -741,7 +741,6 @@ test_types (void) " " " " " " - " " " " " " " " diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c index a1a291ac0d..048ef220ff 100644 --- a/testsuite/gtk/notify.c +++ b/testsuite/gtk/notify.c @@ -375,7 +375,6 @@ test_type (gconstpointer data) g_str_equal (g_type_name (type), "GtkNumerableIcon") || g_str_equal (g_type_name (type), "GtkRadioAction") || g_str_equal (g_type_name (type), "GtkToggleAction") || - g_str_equal (g_type_name (type), "GtkTable") || g_str_equal (g_type_name (type), "GtkUIManager") || g_str_equal (g_type_name (type), "GtkImageMenuItem")) return; -- 2.30.2